| author | Matthieu Gallien <matthieu.gallien@nextcloud.com> | |
| Fri, 4 Apr 2025 14:33:56 +0000 (16:33 +0200) | ||
| committer | backportbot[bot] <backportbot[bot]@users.noreply.github.com> | |
| Mon, 7 Apr 2025 10:53:38 +0000 (10:53 +0000) | ||
| commit | bf1a13913a5f378f70eed3063c35bf69da2477c4 | |
| tree | 0ecf1373f79cafdf7639277b7d20d58a32d5d33b | tree | snapshot |
| parent | 69599b010fd8ef3e1e5dc418d15961275f9c702e | commit | diff |
| src/gui/conflictsolver.cpp | diff | blob | history |